Stichworte: make performance improvements